Merge "Revert "Simplify thumbnail styling to have consistency with mobile implementat...